From eb037279db30fc5fc6fddc7af7e0427384209b02 Mon Sep 17 00:00:00 2001 From: jacob berkman Date: Mon, 22 Oct 2001 17:01:11 +0000 Subject: [PATCH] don't cast a PIXTEXT cell to a PIXMAP cell (fixes crash when using PIXTEXT 2001-10-22 jacob berkman * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to a PIXMAP cell (fixes crash when using PIXTEXT cells) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkclist.c | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/ChangeLog b/ChangeLog index ef15b71a0c..6dada401ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-22 jacob berkman + + * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to + a PIXMAP cell (fixes crash when using PIXTEXT cells) + Sat Oct 20 18:58:25 2001 Owen Taylor * gtk/gtkentry.h: Deprecate gtk_entry_set_editable. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ef15b71a0c..6dada401ae 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-10-22 jacob berkman + + * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to + a PIXMAP cell (fixes crash when using PIXTEXT cells) + Sat Oct 20 18:58:25 2001 Owen Taylor * gtk/gtkentry.h: Deprecate gtk_entry_set_editable. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ef15b71a0c..6dada401ae 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-10-22 jacob berkman + + * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to + a PIXMAP cell (fixes crash when using PIXTEXT cells) + Sat Oct 20 18:58:25 2001 Owen Taylor * gtk/gtkentry.h: Deprecate gtk_entry_set_editable. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ef15b71a0c..6dada401ae 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-10-22 jacob berkman + + * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to + a PIXMAP cell (fixes crash when using PIXTEXT cells) + Sat Oct 20 18:58:25 2001 Owen Taylor * gtk/gtkentry.h: Deprecate gtk_entry_set_editable. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ef15b71a0c..6dada401ae 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-10-22 jacob berkman + + * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to + a PIXMAP cell (fixes crash when using PIXTEXT cells) + Sat Oct 20 18:58:25 2001 Owen Taylor * gtk/gtkentry.h: Deprecate gtk_entry_set_editable. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ef15b71a0c..6dada401ae 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-10-22 jacob berkman + + * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to + a PIXMAP cell (fixes crash when using PIXTEXT cells) + Sat Oct 20 18:58:25 2001 Owen Taylor * gtk/gtkentry.h: Deprecate gtk_entry_set_editable. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ef15b71a0c..6dada401ae 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-10-22 jacob berkman + + * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to + a PIXMAP cell (fixes crash when using PIXTEXT cells) + Sat Oct 20 18:58:25 2001 Owen Taylor * gtk/gtkentry.h: Deprecate gtk_entry_set_editable. diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 4d35839036..0e1c467e0e 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -2618,6 +2618,11 @@ cell_size_request (GtkCList *clist, switch (clist_row->cell[column].type) { case GTK_CELL_PIXTEXT: + gdk_window_get_size (GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap, + &width, &height); + requisition->width += width; + requisition->height = MAX (requisition->height, height); + break; case GTK_CELL_PIXMAP: gdk_window_get_size (GTK_CELL_PIXMAP (clist_row->cell[column])->pixmap, &width, &height); -- 2.30.2